merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 24 Nov 2010 01:55:49 +0000 (10:55 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 24 Nov 2010 01:55:49 +0000 (10:55 +0900)
commitdb817eb40c5a5d59646c73b89d6706218794ef02
tree2071526ab41a0f24aa143f5682fdc081da063be8
parent282a8bd17509ca0862b3bb445bcb27dc66980ae8
parentf42274c5f568da5051b8c534258d21c6131ea000
merge trunk